Auto merge of #3947 - matklad:bench-bench, r=alexcrichton
authorbors <bors@rust-lang.org>
Wed, 26 Apr 2017 05:48:11 +0000 (05:48 +0000)
committerbors <bors@rust-lang.org>
Wed, 26 Apr 2017 05:48:11 +0000 (05:48 +0000)
Allow test named `test`

Looks like `srt/test.rs` and `src/bench.rs` used to be default
integraion test and benchmark, but they no longer are.

closes #3932

1  2 
tests/test.rs

diff --cc tests/test.rs
Simple merge